shell: Drop questionable vfuncs

Both ShellAppSystem and ShellTrayManager are used as singletons, which
significantly reduces the usefulness of inheritance - it's unlikely for
extensions to inherit from them anyway (AND use any of the vfuncs), so
drop them to allow defining the types as final in an upcoming commit.

diff --git a/src/shell-app-system.c b/src/shell-app-system.c
index a4061cb2f53359d203947a856ea5873e594b5eb3..108b616c4dddf41e59d183be235c541980763898 100644 (file)
--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@@ -64,8 +64,8 @@ static void shell_app_system_class_init(ShellAppSystemClass *klass)
     g_signal_new ("installed-changed",
                  SHELL_TYPE_APP_SYSTEM,
                  G_SIGNAL_RUN_LAST,
-                 G_STRUCT_OFFSET (ShellAppSystemClass, installed_changed),
-          NULL, NULL, NULL,
+                  0,
+                  NULL, NULL, NULL,
                  G_TYPE_NONE, 0);
 }
 

diff --git a/src/shell-app-system.h b/src/shell-app-system.h
index 16a2c550fa29c36cd31b4f29d2878b9ff74451c5..f9ed003cb5a95cfd5617fae50652de8e8fec9b4b 100644 (file)
--- a/src/shell-app-system.h
+++ b/src/shell-app-system.h
@@ -29,9 +29,6 @@ struct _ShellAppSystem
 struct _ShellAppSystemClass
 {
   GObjectClass parent_class;
-
-  void (*installed_changed)(ShellAppSystem *appsys, gpointer user_data);
-  void (*favorites_changed)(ShellAppSystem *appsys, gpointer user_data);
 };
 
 GType           shell_app_system_get_type    (void) G_GNUC_CONST;

diff --git a/src/shell-tray-manager.c b/src/shell-tray-manager.c
index cc2519a02151b7c9e23a573638bca4f4c3fb4a8d..5fe165ebe3911a39342b52f84c3b6f9af169db19 100644 (file)
--- a/src/shell-tray-manager.c
+++ b/src/shell-tray-manager.c
@@ -152,7 +152,7 @@ shell_tray_manager_class_init (ShellTrayManagerClass *klass)
     g_signal_new ("tray-icon-added",
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (ShellTrayManagerClass, tray_icon_added),
+                  0,
                   NULL, NULL, NULL,
                   G_TYPE_NONE, 1,
                   CLUTTER_TYPE_ACTOR);
@@ -160,7 +160,7 @@ shell_tray_manager_class_init (ShellTrayManagerClass *klass)
     g_signal_new ("tray-icon-removed",
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (ShellTrayManagerClass, tray_icon_removed),
+                  0,
                   NULL, NULL, NULL,
                   G_TYPE_NONE, 1,
                   CLUTTER_TYPE_ACTOR);

diff --git a/src/shell-tray-manager.h b/src/shell-tray-manager.h
index f19167aef650648a8d04c2b5c80a9a8dd14f9884..0f281dcf480beb7651d6c76fa1e4ab2c5a815071 100644 (file)
--- a/src/shell-tray-manager.h
+++ b/src/shell-tray-manager.h
@@ -29,13 +29,6 @@ struct _ShellTrayManager
 struct _ShellTrayManagerClass
 {
   GObjectClass parent_class;
-
-  void (* tray_icon_added)   (ShellTrayManager *manager,
-                             ClutterActor     *icon,
-                             const char       *lowercase_wm_class);
-  void (* tray_icon_removed) (ShellTrayManager *manager,
-                             ClutterActor     *icon);
-
 };
 
 GType             shell_tray_manager_get_type     (void);